Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 10 Aug 2010 22:43:27 +0000 (22:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 10 Aug 2010 22:43:27 +0000 (22:43 +0000)
commit3c4c3f6b75b4bd1c0b30d5b1383d8212b31e0d3c
tree57f397c6b6fad26cc1b0029811cabf6880e350a4
parent285e4317e087d56c898a6a29b907573355496e93
parentdc97a7ddd99bbad7fc1d99d1192dc2b70d6ac2dd
Merge from mainline.